diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 0ed4b19..3a966fa 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -388,7 +388,7 @@
 				(struct efi_hii_guid_package *)package);
 			break;
 		case EFI_HII_PACKAGE_FORMS:
-			printf("\tForm package not supported\n");
+			EFI_PRINT("Form package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_STRINGS:
@@ -396,19 +396,19 @@
 				(struct efi_hii_strings_package *)package);
 			break;
 		case EFI_HII_PACKAGE_FONTS:
-			printf("\tFont package not supported\n");
+			EFI_PRINT("Font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_IMAGES:
-			printf("\tImage package not supported\n");
+			EFI_PRINT("Image package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_SIMPLE_FONTS:
-			printf("\tSimple font package not supported\n");
+			EFI_PRINT("Simple font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_DEVICE_PATH:
-			printf("\tDevice path package not supported\n");
+			EFI_PRINT("Device path package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_KEYBOARD_LAYOUT:
@@ -416,7 +416,7 @@
 				(struct efi_hii_keyboard_package *)package);
 			break;
 		case EFI_HII_PACKAGE_ANIMATIONS:
-			printf("\tAnimation package not supported\n");
+			EFI_PRINT("Animation package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_END:
@@ -522,33 +522,33 @@
 			remove_guid_package(hii);
 			break;
 		case EFI_HII_PACKAGE_FORMS:
-			printf("\tForm package not supported\n");
+			EFI_PRINT("Form package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_STRINGS:
 			remove_strings_package(hii);
 			break;
 		case EFI_HII_PACKAGE_FONTS:
-			printf("\tFont package not supported\n");
+			EFI_PRINT("Font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_IMAGES:
-			printf("\tImage package not supported\n");
+			EFI_PRINT("Image package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_SIMPLE_FONTS:
-			printf("\tSimple font package not supported\n");
+			EFI_PRINT("Simple font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_DEVICE_PATH:
-			printf("\tDevice path package not supported\n");
+			EFI_PRINT("Device path package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_KEYBOARD_LAYOUT:
 			remove_keyboard_package(hii);
 			break;
 		case EFI_HII_PACKAGE_ANIMATIONS:
-			printf("\tAnimation package not supported\n");
+			EFI_PRINT("Animation package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			break;
 		case EFI_HII_PACKAGE_END:
@@ -609,7 +609,7 @@
 				break;
 			continue;
 		case EFI_HII_PACKAGE_FORMS:
-			printf("\tForm package not supported\n");
+			EFI_PRINT("Form package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_STRINGS:
@@ -617,19 +617,19 @@
 				break;
 			continue;
 		case EFI_HII_PACKAGE_FONTS:
-			printf("\tFont package not supported\n");
+			EFI_PRINT("Font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_IMAGES:
-			printf("\tImage package not supported\n");
+			EFI_PRINT("Image package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_SIMPLE_FONTS:
-			printf("\tSimple font package not supported\n");
+			EFI_PRINT("Simple font package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_DEVICE_PATH:
-			printf("\tDevice path package not supported\n");
+			EFI_PRINT("Device path package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_KEYBOARD_LAYOUT:
@@ -637,7 +637,7 @@
 				break;
 			continue;
 		case EFI_HII_PACKAGE_ANIMATIONS:
-			printf("\tAnimation package not supported\n");
+			EFI_PRINT("Animation package not supported\n");
 			ret = EFI_INVALID_PARAMETER;
 			continue;
 		case EFI_HII_PACKAGE_END: